("epa-hook"): Load epa-hook instead of epa-file-hook.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97b84e2b001cda6f02a05f0e7fef589558263a35..ad8edc65b340ae73c830fa28096db6692322bf82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-08  Eli Zaretskii  <eliz@gnu.org>
 
+       * loadup.el ("epa-hook"): Load epa-hook instead of epa-file-hook.
+
        * epa-hook.el: Renamed from epa-file-hook.el, to avoid
        file-names clashes on 8+3 filesystems.
 

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 44a73c901ce0c6668d346d66ead674945e1421c6..805f82c09f4bd2136917d7b73019df7242414b80 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -93,7 +93,7 @@
 (load "help")
 
 (load "jka-cmpr-hook")
-(load "epa-file-hook")
+(load "epa-hook")
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")